Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FM2-212 : Extend allergyIntoleranceResource to support update delete. #212

Merged
merged 1 commit into from Jul 14, 2020

Conversation

Akayeshmantha
Copy link
Member

Description of what I changed

Extend allergyIntoleranceResource to support update delete opertions.

Issue I worked on

see https://issues.openmrs.org/browse/FM2-212

Checklist: I completed these to help reviewers :)

  • [ X] My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • [ X] I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • [ X] I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • [ X] All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • [ X] My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@codecov
Copy link

codecov bot commented Jun 15, 2020

Codecov Report

Merging #212 into master will increase coverage by 0.01%.
The diff coverage is 78.95%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #212      +/-   ##
============================================
+ Coverage     81.98%   81.99%   +0.01%     
- Complexity     1626     1652      +26     
============================================
  Files           163      163              
  Lines          4239     4303      +64     
  Branches        518      524       +6     
============================================
+ Hits           3475     3528      +53     
+ Misses          520      495      -25     
- Partials        244      280      +36     
Impacted Files Coverage Δ Complexity Δ
...ers/r4/AllergyIntoleranceFhirResourceProvider.java 91.30% <75.00%> (-8.70%) 13.00 <3.00> (+3.00) ⬇️
...ers/r3/AllergyIntoleranceFhirResourceProvider.java 92.31% <81.82%> (-7.69%) 14.00 <4.00> (+4.00) ⬇️
...providers/r4/PractitionerFhirResourceProvider.java 90.48% <0.00%> (-9.52%) 12.00% <0.00%> (+4.00%) ⬇️
...ders/r4/MedicationRequestFhirResourceProvider.java 90.91% <0.00%> (-9.09%) 11.00% <0.00%> (ø%)
...r2/providers/r4/EncounterFhirResourceProvider.java 91.30% <0.00%> (-8.70%) 13.00% <0.00%> (+4.00%) ⬇️
...providers/r3/PractitionerFhirResourceProvider.java 91.30% <0.00%> (-8.70%) 12.00% <0.00%> (+4.00%) ⬇️
...r2/providers/r3/EncounterFhirResourceProvider.java 91.67% <0.00%> (-8.33%) 13.00% <0.00%> (+4.00%) ⬇️
...ders/r3/MedicationRequestFhirResourceProvider.java 91.67% <0.00%> (-8.33%) 11.00% <0.00%> (ø%)
...ule/fhir2/providers/util/TaskVersionConverter.java 1.95% <0.00%> (+0.97%) 2.00% <0.00%> (+1.00%)
...e/fhir2/providers/r3/TaskFhirResourceProvider.java 100.00% <0.00%> (+11.11%) 12.00% <0.00%> (+2.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3124b06...837852d. Read the comment docs.

Copy link

@tendomart tendomart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Akayeshmantha Discovered unwanted spacing in the Test Classes.

Copy link
Member

@corneliouzbett corneliouzbett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @Akayeshmantha Everything else looks great

@Akayeshmantha
Copy link
Member Author

thanks @ibacher for the rebase

@Akayeshmantha
Copy link
Member Author

@ibacher @corneliouzbett did the changes.

@Akayeshmantha Akayeshmantha force-pushed the patch-3 branch 3 times, most recently from 0e7dd38 to 723856a Compare June 29, 2020 12:19
@Akayeshmantha
Copy link
Member Author

Akayeshmantha commented Jun 29, 2020

@ibacher @corneliouzbett pushed the changes. I tried to rebase but it seems like there the merge branch commit was not rebased properly.

I think it is possible to squash during the merge. If so that will be great thanks.

@Akayeshmantha Akayeshmantha force-pushed the patch-3 branch 3 times, most recently from e554e9c to 8d111eb Compare June 30, 2020 14:05
@Akayeshmantha
Copy link
Member Author

@ibacher pushed the changes

I also added the tests for the task resource which was commented before.

@Akayeshmantha
Copy link
Member Author

@corneliouzbett pushed all the changes.

@Akayeshmantha
Copy link
Member Author

@corneliouzbett can we merge this

@Akayeshmantha Akayeshmantha force-pushed the patch-3 branch 3 times, most recently from da5f6be to 9b1d672 Compare July 9, 2020 13:22
@Akayeshmantha
Copy link
Member Author

Hi @ibacher thanks for the fix. I fixed the build back. And squashed the commits

@ibacher
Copy link
Member

ibacher commented Jul 14, 2020

Yeah, I need to stop using the GitHub edit feature to try to fix things. Thanks!

@ibacher ibacher merged commit 5690ccd into openmrs:master Jul 14, 2020
@Akayeshmantha Akayeshmantha deleted the patch-3 branch July 14, 2020 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants